bitkeeper revision 1.1389.5.1 (4277a7497F1hK5nYlFqibtXDq_Uo5A)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xxx.bk

diff --cc BitKeeper/etc/logging_ok
index 6ddee7bec829e9122cf185658bf390f660365abd,90b505243e02261041433a54d838e0daaee047f4..17f57acbf9ef6349d999c1fee3eea1c4b725d1c9
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -97,5 -72,5 +97,6 @@@ tw275@labyrinth.cl.cam.ac.u
  tw275@striker.cl.cam.ac.uk
  vh249@airwolf.cl.cam.ac.uk
  vh249@arcadians.cl.cam.ac.uk
 +xen-ia64.adm@bkbits.net
  xenbk@gandalf.hpl.hp.com
+ ydroneaud@mandriva.com

diff --cc linux-2.4.29-xen-sparse/mkbuildtree
Simple merge